Generate entrypoints for test bundles on macOS #9018
Conversation
|
@swift-ci test |
| @@ -695,6 +695,11 @@ public final class SwiftBuildSystem: SPMBuildCore.BuildSystem { | |||
| settings["ARCHS"] = architectures.joined(separator: " ") | |||
| } | |||
|
|
|||
| // When building with the CLI for macOS, test bundles should generate entrypoints for compatibility with swiftpm-testing-helper. | |||
| if buildParameters.triple.isMacOSX { | |||
There was a problem hiding this comment.
macOS, or all Darwin?
There was a problem hiding this comment.
Well we don't support command-line execution of tests on other Apple platforms anyway, so...
There was a problem hiding this comment.
Execution doesn't matter, this is about the build. The build system does not assume that the machine/tool building the tests is the one running them.
There was a problem hiding this comment.
Okay: we support neither building nor executing tests on iOS using SwiftPM.
| @@ -278,7 +266,7 @@ struct TestCommandTests { | |||
| ) | |||
| } | |||
| } when: { | |||
| buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows | |||
| buildSystem == .swiftbuild | |||
There was a problem hiding this comment.
issue (possibly-blocking): this seems like a regression as this is now failing on all platforms, while it was previously only failing on Windows. Why is the plan to address this?
| (buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem) | ||
| // || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline) | ||
| || (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem ) | ||
| buildSystem == .swiftbuild |
There was a problem hiding this comment.
issue (possibly-blocking): this seems like a regression as this was previously passing on macOs, but is not failing. Why is the plan to address this?
| (buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .windows) | ||
| || (buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .linux && CiEnvironment.runningInSmokeTestPipeline) | ||
| || (buildSystem == .swiftbuild && ProcessInfo.hostOperatingSystem == .linux && CiEnvironment.runningInSelfHostedPipeline) // error: SwiftCompile normal x86_64 /tmp/Miscellaneous_EchoExecutable.sxkNTX/Miscellaneous_EchoExecutable/.build/x86_64-unknown-linux-gnu/Intermediates.noindex/EchoExecutable.build/Debug-linux/TestSuite-test-runner.build/DerivedSources/test_entry_point.swift failed with a nonzero exit code | ||
| buildSystem == .swiftbuild |
There was a problem hiding this comment.
issue (possibly-blocking): this has a catch all, while the previous changes were targeting specific issues on the platforms. It can be argued the test was passing on macOS, except we were not seeing the expected outputs, which may be expected for SwiftBuild.
What is the plan to address this?
| @@ -300,8 +288,7 @@ struct TestCommandTests { | |||
| #expect(result.stderr.contains("-enable-testing")) | |||
| } | |||
| } when: { | |||
| (buildSystem == .swiftbuild && .windows == ProcessInfo.hostOperatingSystem) | |||
| || (buildSystem == .swiftbuild && .linux == ProcessInfo.hostOperatingSystem && CiEnvironment.runningInSelfHostedPipeline) | |||
| buildSystem == .swiftbuild | |||
Closes #8973
Ensure test bundles get a main symbol on macOS so swiftpm-testing-helper can kick off tests. We may want to rename this entrypoint to solve some issues with testable executables though.